Simplified field_merger, added tests.
Gateway manager and initial tests.