Fix failing test
(cherry picked from commit 305cbbc)
Fix OS dependant test (date format)
(cherry picked from commit b2a4ccc)
Fix failing tests
Merge branch 'onyx-1.8.x' of github.com:obiba/onyx into onyx-1.8.x
Merge remote-tracking branch 'upstream/onyx-1.8.x' into onyx-1.8.x