Added OGNL as an explicit dependency.
Refactored test naming facilities.