Fixed Test bugs.