Modified to include other test types