core: get tests passing again