Clean up compat tests