MB-146 #Fixed some tests