Add our own managerError wrapper for waddrmgr.ManagerError
Move a couple of tests back to waddrmgr package where they belong