Fix the spec tests. Once and for all.