20130909 fixing up tests

Some tests are improved (that is, work), some are still a bit broken. Overall, things are better.