Further refactor specs.