Ensure compatibility with Unit tests