removed extra id field from user and test