Add some tests. Fix some rspec tests
Delete redundant tests, change factories, and fix some things