added test-case number in test scripts
refactoring
implementing Expr