Fixed Test Issue, #1