Took out unnecessary id's

Reflected changes in test files