Unit tests seem to be working a little more reliably now