CE-1162 Update unit tests