* Fixed test and imports
Merge branch 'MLHR-1415_pull' into MLHR-1415_pull_test