Made progress on the tests and updated the factories. Need to refactor the tests now