Some updates to tests to reflect updated presentation.