update tests and included helper