Renamed folder name, final copy, added test cases