fix tests, add missed files