Updated test files from Benji