Removing unused imports Reworking tests to include more specific contexts Splitting store and restore tests Adding missing tests for utils