general fixes in dev for TestAPI.java tests