Minor changes for test