Minor updates in Tests and User