Add accountId property and improve configuration testing.