A couple more fixes to apply tests