more tests
code clean-up