Additional test modifications.