Fixes tests for base.py