More Unit Tests. Coverage now 93.1%