Fix imports, rename Tests folder