Hopefully this will get better results for unit tests