Improve tests ans tests' imports