master for test review, 

@strand, @aespaldi 

Thanks for reviewing our rspec tests!