Updated test fixtures to correct unit test failures
Merge branch 'staging' of github.com:bedatadriven/activityinfo into staging