fixed factory and most model tests