fix and more tests