added regex for column expression, but removed two unit tests which need to be altered