MA-1084 #time 1h updated tests and compatibility