Updated tests and references.