Updated data
Updated testcode