Fixed some test issues