Added paths for refactored utils and tests.
Merge remote-tracking branch 'origin/master'