Updated tests to resolve some issues.