Last updates to tests