Fixed conc; fixed tests.