INFRA-1361 test the right stuff, add coverage