Refactor - odd test now better cover 0 1 many