Demonstrate hole in unit tests

Re-factor module internals for conciseness. TravisCI has my back on this one.