Remove incorrect workaround for paramaterized tests and add special parser for JUnit tests