tests runnable via python -m tests.__init__
move tests to be adjacent to main module
get swatch to pass tests in both python2.7 and python 3.3