Changed targets to match new test naming conventions.
workaround for multithreaded static initialisation on windows.