More tests for world and some small fixes