Adding tests, functionality for world.cpp