DEVIDM: Updated tests.