Updated runtests.py, refactoring tests, and updated coverage.