Layout changes and first spec for correct event testing