Simplifies test by removing unnecessary class.
Ensures primary key specified by user is checked first.