Updated to easy mock 3.1