Fixed dependency issues for tests, and we are now close to working