MB-146 #Fixed tests and code to pass