Code review fixes:
* Made tests more robust by listening for status changes instead of just waiting for file access to complete
* Scrubbed real names out of mock data
* Comment fixes