Fix more test failures, limit tests to bpython package