Changed base.py to make tests pass again.