Refactoring API, creating API test bench app.