Restaured RSpec test coverage to > 99%