Fixing tests

There is a new name to the first tests and the missing includes have
been added.