Test tweaks, bump coverage