Added test files
Implemented import from file and improved tests