#488 Improved test_api command