Fixed tests for 1_1_x branch