Merge "Removal of useless test files"