Further streamlined testing.