more tests, a few other change, but lots more to be done