reorganising tests