Leftovers from the old test case implementation removed.

Two files that were missing from the previous commits have been added.