Fixed a couple of test issues.