Still need to move create_sinon out.