Argh, I forgot to copy some change and {}.def() wasn't working... Now works. Sorry.

In addition, I've updated the first class test in order to use this new
syntax.