ERT-753: Updated many tests