Merge pull request #219 from digawp/api-test-fix
API test + misc fixes

(main@4c6d650d9f4d3075ed433a16741babf650629a85)