Updated Project
Added more test cases