Main tests update