make-testable
make-testable2
Merge pull request #7 from waterlow/make-testable

Make testable