Clean up code paths

follow RSpec's behavior