Improved and updated the test file