- some minor changes based on review feedback
- added another fall back test