Add test for 5230 and 5240