Fixed some minor test issues