[TEST] Beef up test and replace deprecated API