added testing and refactored store import method