added more world tests and fixed some bugs