improve testing helpers