More tests; More call options