FX19 compat updates (bugs 837928, 837930)
Compat test cleanup