Simplify expectations logic

This way, we don't need to add the ugly try-except-finally
block which adds an indentation level to each test method.

Author: pamarcos