Add a failing assumption
Refactor code a little