Compatibility with 5.4 and more Unit Tests