MB-146 #Added more tests, fixed old ones