Restore commented out tests This restores the commented out tests (even though they're slow) and fixes some trailing whitespace.