Revert "tddium commits"

This reverts commit bf52484d22549d65eaea50fb76b9d8142a604197.
Add back appropriate parts