some house keeping changes. added test helper