Fixed dependency issues in tests
fixed issues