Add GDRSMock protocol and logging tests
Add more return tests