Updated license headers.
Fixed problems with a test.