some fixes for test