Updated tests. Timing issues.