Removed another horrible and unnecessary #define private public in unit test code.