Tweak tests naming and indentation