Improve test coverag

cc @jone