bug fix and more tests