Added new test cases and completed World Layout