Move import functionality to an own module
Add some missing specs for Repository