Exclude mock tests because:  MockServer cannot run on openJDK1.6
Refactoring - package class move