added in FactoryGirl to models tests, got them working as well as when I got them. Now to fix them.
fixed model tests and validations and added in factory girl after HABTM change in schema