Yet another attempt at fixing build issues with unit tests.