fixed some tests and updated factory with new column names and validation requirements ,for the most part. deleted irrelevant tests. much left to fix
fixed many broken tests. 31 still broken, mostly dealing with store_admin and other things that arent fully fleshed out
fixed merge conflicts with master and tidied some line lengths;
Fixed merge conflict with specs, making sure Laura's changes took precedence
Stashed change
Fixed merge conflict