Layout tweaks
Fix some test code.