Added simple search functions and first tests