Update many tests in response to tutorial changes