Removed files from root and added test cases