remove controller specs (handled in features)
fill out a few more tests, and cleanup some code