more test coverage and remove validation method