CRA-505: Testing