some more fix in test...