started refactoring WorldTest