Got rid of all comments and fixed user tests