some tests fixes