Make all specs pass