MB-81 #Cleaned up test logic