Sorted dependencies.
Uncommented the tests.