Removed error in primitive test and removed minor redundancies.