Fixed integration/unittest for previous commit