Refactored the tests to use Guid instead of the noun's unique id. Other small changes.