Update tests for Expression