Fixing committed build configuration.  Whoops.
Removing legacy tests since they don't run.