Add and edit many new tests and layout tweaks.