added user friendship stuff and fixed some tests