Refined the test files a bit.