Upgrade to C* test model