Updating tests for 1.8