Added assertions to unittest
Finished factorytest
Moved todo to done