Minor changes to test