Fixed tests, added more tests of load()