Existing tests now pass.