Improved tests to remove time dependency.