removed CS17setup and all check_expects