Fixed dep problem.
Fixed one failing test.