fix few more tests. Still some tests are failing...