Bring test coverage back up to 97%