tests fixed
implemented functional testing
Merge pull request #23 from boda2004/functional-testing

functional-testing