decoupled tests
Merge pull request #84 from liuggio/master

decoupled tests