Trunk 3970

For unknown reasons, this new unit test was failing in the @Before, so I just moved it out to a separate module.