Add some tests that hang or crash, and remove some that don't any more