support %- %+ variables
modify some test codes for supported %+, %- variables