Several fixes for older tests