Added more tests.  Disabled failing tests.