All pass in test; still needs more cases