Merged @PragTob's work (https://github.com/PragTob/shoes4/commit/c9cc463b482404eac8e7816a9e12292892ef52b2). Adjusted the mocks now. Thanks!