Added some sections and tests