Updated to test for multiple users