make tests green, optimize imports