cleanup and improve the 1-api test suite