DEVIDM-86: Fixed some broken tests.