Correct imports after moving
Add instructions for running tests