test file and fixes