NXP-13718: add test for custom select statement + cleanup
NXP-13718: fix tests for custom select statement