Fix last loop tests, move some to can_ok