DEVIDM-102 - Added some tests.
DEVIDM-102 - import fix