* Thesis corrections suggested by supervisor.
* Missing tests for replacing params in context.