A few minor updates. Fixed the test file.