Removing dependencies
Broke up test suite