Added more content on World Class. Added more World tests.