Fixes

- More tests
- Passing delegate context
- Fixing val value check