Made all specs and features passing.