bugfix, core tests all passing again