api test is ready, small refactoring done