NXP-16119: fformat + cleanup
NXP-16119: fix test datasources deployment