Cleanup (formatting)
IDEA-74272 (re-fixed, test added)
Cleanup (test relocated to correct package)
IDEA-56021 (test added)