Better testing
Actor type filtering