testandcover fixes