Improve mock linking style
Update to 3.0.1