Move import to correct place.
clean up unit tests use of constants
Merge remote-tracking branch 'origin/master'