Fix #25 make feature complete tests pending