small test refactoring

Please review @SaschaSchmidt