Merge pull request #76 from acmetech/master

Add some testing around activity_fields
Merge pull request #80 from acmetech/master

A few minor updates