Refactored tests so that "python -m unittest discover" runs all tests