Changes to be committed:
	modified:   core/base.py
	modified:   tests/core_test.py