Updating tests and changes
Merge branch 'master' of https://github.com/Lineaweaver/ActivityApplication.git