Refactor the Assertion class
Remove old stuff
Create expectations