One more try to get code coverage up to scratch