Moved as many tests as possible explicitly into check-framework, and tried to reduce code duplication as far as possible.