Unit test improvements
Merge pull request #5 from oat-sa/quality

Unit test improvements