mattdrayer/master: Better mocking, new workflow