Add fail tests & fix