Merging fix of SBA PLC tests in !1764.
Merging fix of SBA PLC tests in !1764 (merged).
Removes use of "-m create_ref" and "-m create_ref_part2".
Merging fix of SBA PLC tests in !1764 (merged).
Removes use of "-m create_ref" and "-m create_ref_part2".