add test for static forwards, and some other cleanups
changes
changes