Remove trailing spaces.
Adapted the test file for the changes in the Metadata interface.