Add various tests and helper methods
Merge remote-tracking branch 'origin/master'

Conflicts:
	[resolved] lib/dumbo.rb