WIP - Updated notes on data context issues and new tests.