simplify API & test