Setup for endpoint report and consolidated some test code.