Clean up invocation tests
Normalize transfer classes more
Make Command more similar to Transfer