more tests, some tests stability issues