Issue #4: Framework for running automated functional tests
Simplified code, removing unused features