Bugfixes, mostly related to test support
Version bump