fist test succeeds
refactor to core