cs fixes in test