Converting Sleep, removing a few obsolete tests.