- Added tests
- Added default value callback