all test files now working, fix this keyword regression