Moved a bunch of tests to the feature spec.