Refactoring of test

This test will fail, and it has not even been compiled.  Checking in and
syncing so I can switch machines.