more tests and a small fix