some more progress, a whole load of tests