udpated activity models to allow for manual uploads, added tests