MB-81 #Fixed bug, sped up test