Add 5010 835 test, cleanup 4010 835 test.