Change init method return types to instancetype, and add two new tests.