Adding missing deps
Simplified tests