Added dependancies for tests
moved test dir under src