Tweak unit tests

More of them now work