util tests and proper imports
added save & find