unit tests fix & find function implementation begin