Merge pull request #355 from cchan5/master

All view activity jUnits work