Renaming some files & adding simple test script