Refactored and fixed-up testMethodsReturn* API tests