Added more tests
Cleaned up some tests and enabled coverage checking