Okay, these unit tests seem to be passing.