Added the test cases
Removed unsed packages