tests added but do not pass
removed current user id from index
fixed merge conflict