Minor adjust to tests