Fixing minor test layouts