[OPENENGSB-3534, OPENENGSB-3480] Merged test project and fixed various checkstyle errors