MB-146 #Updated tests