Got rid of unused imports
Renamed .functests to just functests