Test Refactoring
Merge pull request #64 from enb-bem/refact-test

Test Refactoring