Fix deprecated warnings
Add some tests
Update file check
Update tests