Updated test infrastructure
Updated cedar