Fix stale find issue; fix unit test defects