If you wanna keep water to a min go for short esters..

Test P and NPP is a great combo!