Merge "Remove timer tests."