Use autospec where appropriate
7 files changed