Fixed ResetWorld, added tests