IDE: folding imports
Fix android tests