Misc unit test changes