Added test coverage
Added more validation and supporting tests