Fixed testing issues.