Fill in and customize layout; streamline testing suite.