We were converting too often, made the condition more exact
Adds new base test class for brokerages: BrokerageTests