more interfaces; tests fixed