Updated tests to use  directory