Switch to SimpleCov for coverage
Add testcases to improve code coverage