Toolbox Test fixes