Fix relative path in new situation.
Travis: run new tests.
Restore deleted file.
Remove new version
Move factories to support dir
Reinclude factories changes.