Cleanups and re-added user/group tests