CS fix and removes exception code test.