Restored test_*