Fix the surfire execution (also rename the root test package)