Simplified test code
Merge pull request #13 from ebu/simplify_test_code

Simplified test code