Adaptation of test classes for the new Amazon crawler.