Fixes #39 and cleans up estimate assertions
Merge pull request #41 from techiev2/tasks

Fixes #39 and cleans up estimate assertions