- fixing last commit (forgot a few things)
- removing factory tests
- prettified source code