Nov12

Creating pull request for code review. See comments in diff.
Where is the duration set? The tests take time.