Add rspec
retab
Ensure full coverage
Merge remote-tracking branch 'origin/pr/2' into feature/pjl