Use functions from the broker, remove need to test.