Activity unity tests

@mwallace Unit tests for the Unify enhancement.