Upgrade to castest4