Updated testcode, removed unused class.