Unit test tweaking