Cleaned several passed tests for type checking.
Merged.