Excluded test that is not 2.2.1 compatible from running with 2.2.1
Ported a bunch of tests to junit4