Tests rearranged to reflect new viewlet.