Added uplink stop logic and refactored tests to clean them up.  Also registration integration tests now use some paramaterized values (i.e. lifetime).