Renamed the recently added classes.

Also moved the ``test_plugin.py`` tests out of
``us-east-1`` and into ``us-west-2``.