For the UTI module, should there be a completely new "includes" directory, inside the "includes directory? I'm assuming this directory is duplicated for testing purposes, otherwise it wouldn't be there.

Not completely sure though!