Cleanup expectation class.

Please run the spec tests for this commit. Also the grunt build task fails as the config file is missing.
I'd prefer to define the join as an empty string rather than a space.  There are several ternaries that set strings to `""` which would result in a double space, which breaks the unit tests.