Some unittesting updates. Probably last commit to this branch before
abandoning