Update tests to use SHR 2.1.0