Fixed file_test.py to use TestArea
Merge branch 'master' into version-1.2