Bring in missed tests from PR