improve web/api tests to run in EM blocks, further API test coverage