Fixing up more unit tests - still a bunch more to do