(r) added some tests