First Testatoo refactor import