BO: Unit testing optimized