Worked on some testing utils...shelved for now
Removed sysout
Changed name field
Added null check