Update notes for submitted changes

* Move like unit tests together; add comments
Update notes for submitted changes

* Mock out time and sleep to avoid races