wrap tests
add util tests
add more tests
fix problems detected by tests