adding more test and cleanup