Improving coverage via fixing broken rspec
Merge remote master with local master