Add advanced tests  and content_tag