Added extra tests and worlds