Comment 7 for bug 1325700

Thanks, Charles. I've linked a new branch, that contains all recommended changes as well as a first crack at some Amulet tests.

The new branch is the same as my original one. I wanted to move it over since I won't be working with it very much from here on out.

Thanks, again, for the compliments and the thorough review.