Seperated factories
Seperated saving tests and added more
Added test groups