Translated more tests to new mockbroker format