Fix initialization and calculation bugs
Undo JUnit version pinning