Improved test file