updated test class names to the correct ones.
removed mock package from externals.
organised imports