Fixed tests from yesterday's redo.