Finished import refactoring phase 2
removed unnecessary List
Mock tests starting