Fix #1041 - Update test files