Re-enable test
Re-order type table
Remove CALL::arg_types