Upgrade to 4.12 Junit and update tests by removing @Category (Samarth Jain)