more tests, stabilize