Refactoring the RSpec Helpers and Spec to be more expressive