Checkpoint: trying to get unit tests to work.