fixed tests after refactorisation of stuff
fixed tests after refactorisation of stuff

hacken-in/hacken-in,hacken-in/website,hacken-in/hacken-in,hacken-in/website,hacken-in/hacken-in,hacken-in/website,hacken-in/website,hacken-in/hacken-in