Slit up calls into ones that require unique id's, and ones that don't. Cleaned up tests, and separated variables