Moved the "findObject" method here.
Added two "find object" tests
Refactored a little.