edec03c
Preserve more test data that we cannot generate from source - Eliminate unnecessary manual requires from swt package