TAMAYA-13 Dependency cleanup for JUnit