Update of the test cases
Clearn up more tests