Additional minor cleanup.
Initial failing test & revealer class