Fix all non-feature tests

All non-feature tests are  passing now. Next stop: fixing (stubbing) feature specs and cleaning up any pending tests.