Use spec_helper directly rather than long relative pathname
Replace instance variables with lambdas