Attempting to remove the use of templated find method in client code so it can be freely tested