Upgrade JUnit to latest (4.11)
Improve code testability
enable unit tests on adapters
Start repairing long dead unit-tests