Re-added tests that fail.