Updates tests for 1.8