Refactored API to include test types