Touched up existing tests in preparation for adding the rest