Minor Test modifications