Unit tests need fixing, but huge improvements on Factories!