Trying to fix test and code coverage ...