Cleaned up autosave test suite and made it less ambiguous