Modified the cleanup code for accounts and pfRule test cases