Merge "Update/add tests for RS versions 18/19."