Added some tests and added some implementation for find methods.