Fixing up some of the tests
Python bundler's requirement changes