Remove method that was pulled from core
Update test dependency
Refactor of FirewallSupport