Spring cleaning of older tests.  Modified to meet current specs.