DEVIDM-95: Tests for the changes made.