Improved identation and names in tests