more tests, some test improvements