This fixes the path to source files in some unit tests and allows to get rid of a few duplicate lines.