Fixing testr branch issues after merging with main branch