4.13 (JUnit): for->regexp, fixes in tests