@jaredkerim you might want to look at the mocking I suggested in https://github.com/mozilla/solitude/pull/213/files, makes life easy for me, might work for you.