Add more assertions and re-arrange them
Add more assertions and re-arrange them

This should make the intent of the assertions more obvious: we're
testing that both the decorated and the undecorated functions act as
expected.

mapleoin/undecorated