Cleanup expectation class.
Fix array concat with arguments.
Update not conditional to avoid multiple spaces.
Merge pull request #38 from tanzeelkazi/expectation-cleanup

Cleanup expectation class.