Added a new test case and disabling the failing test in order to push to master
Small renaming of an internal class
Formatting.