changes to the reset.cql plus a couple of tests