added test coverage and choice values