Merge "Refactor test 983 to prepare for inclusion in CTS"