Minor changes.
Formatting fixed.
Failing test fixed.