more tests with some fixes