added/improved a few test helpers