Add unit tests for 70%+ codecoverage