Cleaned and fixed tests
Upgraded: dependencies
Cleaned and fixed tests