Needed housekeeping

Added SimpleCov
Improved tests
Fixed some edge cases