Finishing up edits to UserIT tests.