Answering minor comments regarding unit test.