added one controller spec
deleted extraneous context
Merge branch 'master' into testing_options_index
Merge pull request #146 from LightningLord/testing_options_index

Testing options index