Restored tests to what we had.