- test coverage and improvements