small fix and more tests