More fixes for test