JBIDE-15871 - Unit test  modifications as per fred's feedback

Forgot static on beforeClass
JBIDE-16122