Cleaned import and tests