continued testing, added tests for users plus added activity model