Deps
Moved to the handler
Streamlining
Simple test