Fixes for world test