Fixed c_and_u tests a bit
Merge pull request #527 from psav/fix_candu_tests

Fixed c_and_u tests a bit