Add some more rights statements.
Changes labels and update tests.