Fix issues from Pull Request 2
Fix copy-pasta issue for SimpleCov