Fixed up some tests / working on coverage.
Added more tests