Tests: Updated tests to run from sub-directories 

Updated tests to run from sub-directories and fixed related misc. issues.