SFD-26
Updating unit tests.