more tests, small improvements