added User and Link andtities with a few tests