* Clean up args and arrange imports * Arrange args in restore tests * Add unit tests for save * Use const instead of let (linting)