Explicit imports to prepare Junit upversion