Now all refactoring done. Specs work again.