Fixed problem with primary key inconsistency
Updated Samples Test