Minor changes (no impact on result)
Adds spec for future feature