Updated testcode