add extra tests
add tests, and reorganize wald for more consistency