Redefine API and edge cases better in new .env API test