Updates to tests for core.py