tests
code fixes