RA-304 Post test fixes