fixing tests
compatability with new core