Merge "Add ResolverActivity testing"