add more tests/fixes