Added User and Friends with tests