refactor even more tests
refactor even more tests

jhass/diaspora,geraspora/diaspora,Amadren/diaspora,KentShikama/diaspora,spixi/diaspora,diaspora/diaspora,SuperTux88/diaspora,geraspora/diaspora,Amadren/diaspora,despora/diaspora,Muhannes/diaspora,KentShikama/diaspora,Flaburgan/diaspora,geraspora/diaspora,geraspora/diaspora,Amadren/diaspora,despora/diaspora,spixi/diaspora,jhass/diaspora,SuperTux88/diaspora,SuperTux88/diaspora,Amadren/diaspora,diaspora/diaspora,spixi/diaspora,jhass/diaspora,diaspora/diaspora,spixi/diaspora,Flaburgan/diaspora,Muhannes/diaspora,diaspora/diaspora,Muhannes/diaspora,despora/diaspora,jhass/diaspora,KentShikama/diaspora,Flaburgan/diaspora,KentShikama/diaspora,Flaburgan/diaspora,despora/diaspora,Muhannes/diaspora,SuperTux88/diaspora