Added actual worlds to test with; continued savefile work.