Making all specs pass