Fix tests doing nothing
Code cleaning
Remove unused path in switch
Minor fixes
Remove debug output
Code DRYing
More code DRYing
Code cleaning
Fix invalid variable name
Add `rewind()` method
Build 3.3.8