Update testing framework
Merge pull request #148 from bisutun/seriously-testing-tho

Update testing framework