savegame: restructuring tests