Updating Unit and Acceptance Tests - et5849