Added the two chapters self tests