Added unit tests. Fixed find method.