Minor updates to some test files