cleanup & new entry testcases