Fixed tests

- Lots of tests related to old files removed those
- Fixed remaining tests, all should pass now