Fix missing key on testlayout
Style tweaks