Making all specs & scenarios pass