DATACASS-93 - finished incomplete tests