Removed old test types