#94 added some tests and working on coverage.