Fixed finder. Added small test