Added source tests and some more testing on search and entry