Update unit tests
Move factories