organized dependencies, fixed a test