Added dependencies
Misc changes for test environment