fixed testing failures.