Test user update and some cleaning up