cleanup
api call method and tests