ERT-606: Added more testing