final tweaks for test build