Minor changes to remove a test