Renaming core files
Updated test files