EDX-391: Modify unit tests