Add fix for pre-defined endpoints and tests