Fix failing specs and make feature pass