Port shortucts to Deps v2
Enable shortucts tests