Updating tests as you suggested

cc/ @cgoncas