Test expansion

* Expands test coverage. See issue #60 
* Minor fixes on formatting
* Started fixing fs_search (but function still does not work). See #64