moving _util functions to separate file; adding unit tests; removing dummy unit tests; better junit diagnostics