Removed unused imports to get clean code
DRY
Merge branch 'ref_tests'