small test refactoring

Please review and merge, if okay @SaschaSchmidt