Consolidated tests to tests.py