Improved API test coverage by removing unnecessary code
tests fixed now?