Adds new tests to UserTests and corrections to UIndex