Add 5488 more tests