All but two tests passing in test_core_unit.py