More tests with file check
-- more fixes
More fixes