Updated to get user tests to work