Some work to make tests work.
Accidentally forgot one file to project.