Some small fixes to the test file to work with a more recent master