IssusID #7
Divide source code into function and test module