Modified Class Structure, moved test_dir to temp folder