Added ActivityHelper and more fixture coverage