Add description to tests and clean up unused imports