Move helpers

Fix tests