Replaced Hard Coded Dependencies and started using Fixtures