Unit test tweaks.