Mocktory update, tests