FIxed tests, copyright, internal api markers