DEP-89 [DEP-101] jUnit tests