Fix minor refactoring leftovers in specs