Test Maintenance Cost

The change to the interface with Profile broke a number of tests in ProfileTest. We need to invest some effort to fix the tests, which highlights one of the costs of using unit tests in the first place; they need to be maintained regularly.

Refactoring