Added small improvements to test file.