Updates for latest strand of comments

- Functional test
- More comments