tests: Started converting test code to use the new WSI.
4 files changed