Test build: Add NPZE & titoko's modifications