my version which solves the dependecy on mockito, still tests fail, will stick to the nr-hydro-devel branch for now