Added more tests to improve the test coverage.  Used rubocop too.