Remove specific version dependencies
Refactor!
Refactor tests
Tests