Finished updating the friendly forwarding for users. Removed some brittle tests.