minor cleanup
Added missing tests for 100% coverage