Fixed some test issues.