Added support for JUnit tests