Manually merging setOrigin and .watch tests

from SHAs:
* f971f4a5944cb1647b9b93a7fc5d1493153e8d99
* ed0cb7a23986e25be43ee71f9f907779fb07ca8d

forceIssuer portions will have to be manually merged later.