Add more stringent M2M tests and fix the bug they exposed