modified testcode and variable name etc.