Some test coverage tweaks