Disabled tests.  Will be fixed in a later PR.