Updating tests. It should be OK now.