testing: simplify code