Just some tweaks to make the unit test more relevant.