Upgrade jUnit to version 4
Fix findbugs finding: 32 int shifted by an amount not in range -31..31

The shifts by 32 bits don't actually have any effect on the value
(as shown by the tests)