#168: fixed specs, refactoring of ActivityFeed