Refactoring spec file, part 2