yada yada yada
Working tests and clean HEAD without hurts
Merge branch 'tmpstash'