Fix test method visibility

Plus dropping unused imports.