Tweak/run unit tests