Fixed issue #1: Latest code from git can't execute tests.