Added test for reincluding and reextending.