Updated broken references.

Fixed coding style.

Added temporary test procedures.