Added site-layout test and helper-test