Filesystem refactor

Made main test file run from tests dir instead of providing test funning
function to a test file in the main dir