Renamed test files and removed __init__.py from base directory.  Use python test.py or nosetests now to run tests.