Enhanced API_test mod