Shave the test
Added DialForce support