Add find method
Improve augmentation test