[DW] refactorings, moved back to junit