Backport tests for 5.3