minor unit test changes for readability