Update the Toolkit to fit the OB tests requirements