more test cleanup added add all test