RA-182 Fixed tests