cleanup

The tests are failing due to 2.x changes