Fixed a few test issues