More data tests, properly close up files