Fixed some timing issues.  More unit tests. Debugging