modify tests; failing helper tests