Finalized the Factories and associated tests
Started work on the Repository