Add back "Table of Content" and do small test