Update long expression test with more tests