added list and remove controls, some tests