Unit test fixes + Interface comments.