Minor Test Improvment