Refactor specs to have clearer fixtures