Fix Router bug where group actions would not clean up well. Added Router tests.