Added more tests, and fixed the unsaved StructMap issue