update tests
add some utilities