More tests update