Tests are passing and ready to be migrated to dist-git