Minor cleanup.  Add enabled/none test case back in. #1074