Cleanup of test classes, entity and world, added more tests.