Some tweaks to the tests. Run more reliably now.